Auto merge of #1270 - alexcrichton:issue-1105, r=brson
authorbors <bors@rust-lang.org>
Fri, 6 Feb 2015 22:44:07 +0000 (22:44 +0000)
committerbors <bors@rust-lang.org>
Fri, 6 Feb 2015 22:44:07 +0000 (22:44 +0000)
Closes #1105

1  2 
src/cargo/ops/cargo_generate_lockfile.rs
src/cargo/sources/registry.rs
tests/test_cargo_registry.rs

Simple merge
Simple merge